Merge from trunk.

diff --cc src/ChangeLog
index e4a76c68ebc1af2064131671a492eb57449110ef,97ddbcc1db96be2118d699cf87a5d633c8cd7b20..540f87f9123dcb1003bdc1aa5cd50b348d7c1a4f
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,7 -1,8 +1,12 @@@
 +2011-07-25  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * Makefile.in (gl-stamp): move-if-change is now in build-aux.
 +
+ 2011-07-25  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+       * bidi.c (bidi_dump_cached_states): Fix printf format mismatch.
+       Found by GCC static checking and --with-wide-int on a 32-bit host.
+ 
  2011-07-25  Eli Zaretskii  <eliz@gnu.org>
  
        * xdisp.c (compute_display_string_pos): Fix logic of caching